more nisto bugfixes