Various fixes to example usage