More fixes for #15