Some fixes due to me not rebasing my branches