A few fixes because I moved the base class package