Fixed more stuff after broken merge