Fix byte-compiler warnings in desktop
Fuse blocks that require on byte-compile