fixing specs, here and there :)