Steve Sept. 24 - Compiling fixes