More fixes

See in commits