Fixed incompatibilities with latest incoming