Cleaning up compiler warnings