Fixed some lingering issues leftover from merge conflict