fixed some smaller issues for windows compatibility