Fix some of the 'class in package object' warnings