Minor bugfixes 2.