Fixes + cleanup