A couple fixes to prev