more fixes for cal