Misc fixes

Give me 5 minutes and I will fix that.