Directory prefix fixes