Quick fixes from launch.