Small improvments (fixes #2)