few small housekeeping updates