Additional bugfixes