Fixing setting boolean and null properties