fixed compliation issues