Some smalle fixes