Ubuntu 13.04 compilation Fixes