Fixes for the spec server