Commit fixes for compiling on ubuntu 12.04