More fixes (birdman's repo)