Minor changes on CritterBase