Fixes for Ubuntu 13.04