more -Wall warning fixes from Cristian Ionescu-Idbohrn.