Few housekeeping changes