Fixed all commands