Fix server and spike spec