Fix some last things in spec