serverside fixes for repo