Small fixes and null fixed for commands.