More fixes #2