cas fixes and such