let-154: small fixes to render according to functionality available