various tiny fixes