Updates from nimrod-code