First fixes

First fixes