Fix *bugs - first run(s)