Attempt to fix merge
Fix some changes that somehow got reverted