Some fixes..