Fix some issues from merging cfpb/idea-box#19 and cfpb/idea-box#20