FS-10 FS-12 cross platform fixes