Minor fixes and code sample updates