Misc changes from meeting