last minite fixes