Some minorfixes