Small fixes on speech and presentation metadata code