Fix command things being buggy.