Adding some adjustments
Merge pull request #1820 from aRn0D/fix/spec-ajustment

Adding some adjustments