cts fixes

This fixes a couple of issues I ran into earlier today.