Fix remaining errors, all specs now pass.