Fixed issues regarding repository