bugfixes and adjustments for new salt version