Ubuntu 13.10 build fixes