EDITING: Misc fixes