Some minor changes to fix build configuration issues on debian-based systems