Small fixes #6