Misc fixes / tuning