[WIP] Minor fixes