Trying to fix compilation issues