Minor updates on generation