This is a small bugfix update for some minor issues encountered with 5.0.0.

Bugfixes