Fixes, tuning