Fixes for command parsing.