Fixes for semicolon repeat nonsense