Fixed inter-OS issues