WIP: small fixes