[Magic-HD] Tweaks and cleanup