Portland proposal fixes