Fixes the first 7 bullets of #32