RFK internal fixes, shouldn't get stuck anymore