Various fixes

Yeah, can do that.