Fixes for v11
Now working on v12