Fixes problems with version-support