fix some compiler warnings that are only present in this branch.