Some fixes;