- [Frederik Eaton]: Misc smaller changes