Fix up for various compiler warnings