FIX ALL COMPILATION ERRORS - 2014-02-24