Inline a few functions that should be