fixing some lingering issues from the merge