Fixed some circuits