Fix build break due to enum namespacing
Fix warnings