fixed some compilation issue