some fixes regarding accounts