Small fixes #2