Updating 2.0.3 release with additional bug fixes