Add missing commands.
Fix stage validation.