Miscelaneous modifications I didn't bother tagging