Fix to support devappserver2