WIP - Minor fixes