Quick spike fixing command line stuff.