More fixes >.<