Circuits Integartion Bug fixes