Correct some compiler warnings