MINOR BUGFIXES