Several small fixes (add milestones typedef)