some fixes for compile