Some fix
Some fixies