Fix milestone problem and double-fade