Some fixes WIP