Fixed some supports