Final fixes for polish week