Fix 2 small bugs