Minor bugfixes for Nicole