Minor bugfixes after flash