More fixes for #12