(XDK1) Minor tweaks