Changes to fix some compiler warnings