More fixes #3