Try to fix some of the code samples