Fixed specs
Some fixes