1.4e - Fixes from debugging run