RIO-41: Various fixes for eto os prepare