Two fixes #6