Cleanup for compiler warnings