Fix 8.1 errors. Fix #4.