Fix issues that occured with merge