Various modifications for HESK v2.5.3