(RMenu/XDK1) Build fixes