Fixes Spec Issues