rc: a couple more fixes for calfw