Cameron minor fixes