More fixes ^^