Few WIP tweaks