Fixes & tests