complete manual fixes for 2.0.1, issue #325