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