[WIP] Some fixes