Bugfixes

You should probably cherry pick:

dcb7785
f96a0d8
bb8d2e9
864a171
4d372e6