Fixes for Tim's restructuring.