Fix the gcc warnings in this module (since we now seem to be