Fix additional compiler warnings