Minor fixes #2