Small cleanup stuff.