[2] Some minor improvements