Some fixes here and there, specs.