Fixes + last DB dump