More overflow bugs fixed by CurlyMoo