Fixes for prosody