More measure fixes.