Tweaks for multiple instances