kasperskov Minor improvements and fixes