Tidy compiler warnings