Cleanup compiler warnings