More rtlib work