Fix some compiler warnings regarding types