more fixes, macros conflicts