Fixed due compilation issues