Minor updates from SDK API