More fixes to make the process smoother