508 fixes, closes issues 265, 263, 262