Tweaks & fix freeze not being used on non-frozen targets