Current control improvements