DEV: Fix compilation errors