Fixes from .14