more cas fixes