Fixed stuff broke by merge