Fixing request and classmate bugs