fixed typedef errors