Various fixes, list pages broken