Fix some issues resulting from new architecture