Fix issues with most recent merge