Build fixes
More of the same
Misc
More of the same