Fixed non-windows builds