Some more fixes for #1280