Fixes + one more test