Minor improvements related to the previous commits