1419 Fix issues found by Jerome