Minor bugfixes 3.