Fix namespace warnings
Fix macro warnings