compile fixes after merge