Fix 10# and #8