Code review comment for lp:~davidagraf/zorba/paging_with_refs

There are a few small fixes that I've sent as a patch via email as I could not push them into this branch. Once this patch is applied this branch works for me.