Fixes bug with nullable compound property clauses, adds file headers