Fixes for my bugs

This now fixes both of the issues I've filed so far. #203, #204, #208