Minor fixes and updated examples to use unprefixed API.