Minor changes on subset