Various 1.5 + 2.0 updates

[Marginal]

See https://forums.frontier.co.uk/showthread.php?t=68771&page=121&p=2737896&viewfull=1#post2737896

This one's partly my fault - before d7e9f08 the code that's blowing up was only called in the relatively rare case that the logs couldn't be found in the standard location.