Fixes from 6.1