Milestone hardy-updates

No date set

Fixes after Hardy release

Note: See TracRoadmap for help on using the roadmap.