Minor paging fix
Several more fixes