Initialize logging earlier (fix panic in tests)
Actually embed GUI changes from 91d5c4a...