Minor changes to clean up g++ warnings