Fixes to Spec Setup