Fix compilation errors for new commands implementation.