fix several swauth issues