Minor additions/changes