Fixes on commands.