Fixes problems that prevented the use of API 11
The last fix is important, let's release it.