small fixes mentioned by Corina