Fixes + simplifications