Various touch ups