Nuked some compiler errors on Linux