Minor changes (following last commit)