Fix compilation issues

Fix compilation issues