508 fixes, closes #273, #271, #269