More fixes... silly mistakes.