Fixes for aliases/os sniffing