- Some fixes