And fixes for what the LAST commit broke (naturally)
Authored by: vampm 2018-06-26
Parent: [r122]
Child: [r124]