Update common lib to include fixed dispatcher code