Bwunger rnikbakh bug fixes