Spec Fixes