Some fixes I've been sitting on for a while.