Misc fixes/tuning