Address Window compile issues