Syntax and API fixes necessary to get examples running