Small fixes that accumulated while revising paging locks