Fix 2 little bugs