Fixups for 2.0.5
More fixups for 2.0.5