More hackday fixes