re-introduce the less aggressive inlines
Resolve some warnings