Fixed incompatibilities between 0.12 and 0.15.