Couple bug fixes.
Bug fixin'.