Good for now.
More fixes