More fixes >.>