Some fixes + non-working example