Fix a few issues based on feedback from launch