minor fixes already in master