201114 Fixes