Misc fixes as passed to us