Fixed Jira tickets FX-72, FX-73, FX-74, FX-75; Merged in Richard Bourne's Windows port.