Re-enable store commands (from e94cb98), couple of typo fixes.