Various fixes, .notnull/.null is back
M