Minor impovements