Clean up compiler warnings