More fixes for the latest update