Minor cleanups
Adapt to new defines semantics