Merge fix

Fixing errors that popped up after trying to merge.