K3.1 Backend: Fixes #2363 #2362 #2361 #2364