Some fixes

Small fixes