Cleaned up compiler warnings