Fix build with UNUSED
Add ALWAYS_INLINE
More progress