Some fixes...