Multiple fixes, still no more examples work though...