Some fixes!