Minor updates to support AI