Compatability tweaks for Ubuntu 13.04