Couple of Fixes