Small changes for consistency