Specs and fixes because of specs