[WIP] First wave of fixes