Fixed some issues with the spec