CAS changes and small updates