Fixes #64 and #67

Yeah, that's too bad. Perhaps we should reconsider having external labels. Probably something UX and Design should weigh in on.