am 3b2a9a00: Fix bugs caused by writing code while half asleep. * commit '3b2a9a00dd4267fcffd370390037001f912347a3': Fix bugs caused by writing code while half asleep.