Breaking changes: fix macros
Fix all build issues