Testing some fixes before moving dev over