Some fixes [WIP]