Short improvements