Some fixes on P350