Milestone bugfixes