Fixed a few compliation issues