Minor changes to avoid compiler warnings