Fixes path issue and user history issue