Updates to fix the desktop base build