Fix some weirdness (#6)