Pack of fixes for 1.1.5