Fixes pp 1-32 from #180