Various improvements to handle Jukola files