Some fixes

Needed updates