Fix errors in variables & nill/null section