Changes to unify mac and windows rendering