(bug 4062) Fix various concerns