Minor finishing tweaks