Minor updates to support functionality