fix warnings, from RT merge fallout