Reported by dcb314. This fixes #135, #136. Change-Id: I0f83a92e18adf68e5ad493b9057d093a6b37b328
Change-Id: Ib18171089c7b389f7f2643d7298f9659e882f65c
Change-Id: Ic716f336b7071063997cf5b4dae6d50e0b4631e9