Fixes to recent changes now that I'm on my Linux desktop