More fixes for #145