Some incremental improvements