Pre-PR fixes