Couple of quick bug fixes.