Fix compilation issues;