Fixing compilation issues - try#: 2