Branch Merge - Bug Fix

Fixed a few errors that happened as a result of the branch merge.