CLEANUP: small fixes