Edits prepping for updating to 0.14