expanded desktop build fixes