Fixes for broken spec