* Some fixes