fixes and nimrod 0.9.2 adaptation