Fix build issues on 3.12.1 and 4.00.1

Also bumped version to 2.0.3-dev