diff --git a/TODO.md b/TODO.md
index 2c6ee17..e0af3d3 100644
--- a/TODO.md
+++ b/TODO.md
@@ -5,20 +5,22 @@
 - [x] Downscale textures
 - [x] Optimize to always run 10+ fps
 - [x] Fit in 32MB VRAM to run on N8, E7, E6, etc.
-- [ ] Fix crash in Texture::destroy on exit
 - [ ] Optimize to always run 20+ fps
 - [x] Fix skinning shader (cutscene heads require it)
-- [ ] Use etc1 compression
+- [ ] Use etc1/pvrtc compression
 - [ ] Simplify geometry
 - [ ] Touch controls
-- [ ] Keyboard controls
+- [x] Keyboard controls
 - [ ] Audio?
 - [ ] Menu
 - [ ] Config
 - [ ] HUD disappearing
-- [ ] Save menu is too slow
 
-S60v3 (in separate branch):
+S60v3 specific:
 - [x] Backport to STLport v4
 - [x] GLES 1.1 engine (WIP)
-- [ ] Keyboard mappings for both QWERTY/12-keys
\ No newline at end of file
+- [ ] Keyboard mappings for both QWERTY/12-keys
+
+Issues:
+- [x] Fix crash in Texture::destroy on exit
+- [ ] Save menu is too slow
\ No newline at end of file
diff --git a/src/core/main.cpp b/src/core/main.cpp
index f77ed49..75df904 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -1403,10 +1403,14 @@ RenderScene(void)
 	}
 #endif
 	PUSH_RENDERGROUP("RenderScene");
+#ifdef GL_RW3
 	CClouds::Render();
+#endif
 	DoRWRenderHorizon();
 	CRenderer::RenderRoads();
+#ifdef GL_RW3
 	CCoronas::RenderReflections();
+#endif
 	RwRenderStateSet(rwRENDERSTATEFOGENABLE, (void*)TRUE);
 	CRenderer::RenderEverythingBarRoads();
 	CRenderer::RenderBoats();
@@ -1453,7 +1457,9 @@ RenderEffects(void)
 //	CSkidmarks::Render();
 //	CAntennas::Render();
 //	CRubbish::Render();
+#ifdef RW_GL3
 	CCoronas::Render();
+#endif
 //	CParticle::Render();
 	CPacManPickups::Render();
 //	CWeaponEffects::Render();