LINT and macro fixes