Fixes from Foundation