Fixed more writer issues, particularly resource scanning