Paper TODO tweaks