Potential fix for 2 bugs. Bump to v2.0.3