Mark non-template functions inline
Some minor fixes/warning reductions