Reported by dcb314. This fixes #128, #129, #130, #131, #132, #133. Change-Id: I284d6dd87fba7c5775bea22d04412d685a2ab027
Change-Id: I86bd20be9b1aec4116edbe112eb562737860568f
Change-Id: Ic716f336b7071063997cf5b4dae6d50e0b4631e9