More pre-push -05 polish