Bug fixes added for upcoming 1.1.7