Fixes outstanding bugs with new syntax.