Bubfixes for #1129