Couple more desktop fixes