Feature/mica fixes

Benoit Mica Fixes