Fix Syntax and null promotions