Fixed minor issues on compilation