Fixes from 06-14