Small changes and housekeeping