Some fixes for alpha version (again)