Misc improvements
More fixes