More fixes ☹