Fixes issues from previous update/merge