Fixed more support bugs