Some fixes to issues i found when building on Ubuntu Quantal