few bugfix