More <onclick>-</onclick> fixes