Fixes for spec