Prepping for 0.8.4 with a couple of small changes