Fix inflection and User stuff