Remove compiler warnings, etc.