Finish merge of unstaged files

These were missed in the last commit