Add correct accept statuses and fix loading bug