Misc fixes Part 2