Minor fixes to upgrade station.