Misc fine-tuning