Bugfixes for Omniwrench module.