Import fixes for build