fixed things I missed during last merge