Some tiny fixes in Juholeils code