A Couple of Fixes