Fixed some support issues