Fixed some silly mistakes in Master