Fixes + adhoc test