Some fixes for future lists

Here's my attempt to address the issues you pointed out @victorjonsson in https://github.com/aaslun/Arlima/commit/1d1a6333ef178f86b0692c667e0e18c4abea5c5b