Fix some minor issues with * endpoints and prevent some semver errors due to module upgrade.