Fixes per recent edits