Make some more inline functions