Some fixes....