Addressed nitpicks