Cass fixes