bug fixes for casablanca