further prefix fixes completed