Misc fixes

Not sure about this one?