Fixes & tests.