Windows & Linux Fixes