BUGFIX 2 minor fixes