Fix compilation
Fix implicit and short