Fixes + Resume