Fix other incompatibilities