Last minute fixes

Before Sadiki