Fixes

Made fixes that got overwritten with previous Merge.