Fixing some bad merging of Ollies code