OP-post fixes