More fixes related to #237 and new dist files.
More fixes related to #237 and new dist files.