Minor modifications to get things compiling for linux-manjaro/g++-4.8.1