[BUGFIX] several minor fixes