Various fixes and pushed version to 4.11.12