Fixed multiple issues relating to 1.11