Minor issue fixes
By minor I mean major dupe bug, but hey.