Marks list fix

Fixes #1022 and errors in build caused by latest changes.