fixed compilation issues after merge