Small fixes

Improvements still not fully fixed