[COMMIT] Fixed two bugs in current ecb 1.04 pre-release