Base proposal fixes