Fixes to San Francisco Model