Fixing minor mistakes from past conversion