Fixed build issues on Windows & Android