fixed mismatched type, fixed invalid const