Add to application_drafts specs and fix small bugs