diff --git a/TODO.md b/TODO.md
index e0af3d3..a88c5af 100644
--- a/TODO.md
+++ b/TODO.md
@@ -3,24 +3,28 @@
 - [x] Fix shader compilation
 - [x] Basic touch controls
 - [x] Downscale textures
-- [x] Optimize to always run 10+ fps
-- [x] Fit in 32MB VRAM to run on N8, E7, E6, etc.
-- [ ] Optimize to always run 20+ fps
-- [x] Fix skinning shader (cutscene heads require it)
-- [ ] Use etc1/pvrtc compression
 - [ ] Simplify geometry
 - [ ] Touch controls
 - [x] Keyboard controls
 - [ ] Audio?
 - [ ] Menu
 - [ ] Config
-- [ ] HUD disappearing
+- [x] Merge S60v3 and ^3 branches
 
-S60v3 specific:
+GLES 2.0 specific:
+- [x] Optimize to always run 10+ fps
+- [x] Fit in 32MB VRAM to run on N8, E7, E6, etc.
+- [x] Fix skinning shader (cutscene heads require it)
+- [ ] Optimize to always run 20+ fps
+- [ ] Use etc1 compression
+
+GLES 1.1 specific:
 - [x] Backport to STLport v4
-- [x] GLES 1.1 engine (WIP)
+- [x] GLES 1.1 engine
 - [ ] Keyboard mappings for both QWERTY/12-keys
+- [ ] Use pvrtc compression
 
 Issues:
-- [x] Fix crash in Texture::destroy on exit
-- [ ] Save menu is too slow
\ No newline at end of file
+- [ ] Fix crash in Texture::destroy on exit
+- [ ] Save menu is too slow
+- [ ] HUD disappearing on GLES 2.0
\ No newline at end of file
diff --git a/src/audio/sampman_null.cpp b/src/audio/sampman_null.cpp
index d607836..b0fa42a 100644
--- a/src/audio/sampman_null.cpp
+++ b/src/audio/sampman_null.cpp
@@ -1,5 +1,5 @@
 #include "common.h"
-#if !defined(AUDIO_OAL) &&  !defined(AUDIO_MSS)
+#if !defined(AUDIO_OAL) &&  !defined(AUDIO_MSS) && (!defined(__SYMBIAN32) || defined(NO_AUDIO))
 #include "sampman.h"
 #include "AudioManager.h"