Various hackday fixes