More fixes soon

Just an intermediary sync