Fix 2 minor issues