Fixes + clean-up