Misc fixes / tuning
Misc fixes