Paper: more fixes