bugfixes to work with hep85