Minor changes to ensure compilation on Debian 7