Syntax change fixes