Some fixes (all works!)