Last minute fixes... GRR