Onward with fixes