Some fixes,