fix up some compiler warnings due to new patches