More fixes. WIP.