justus bugfixes end of 8.1