Hopefully fixed version incompatibility issues.