Small tweaks while manual testing