Changes to ensure compilability on Debian 7