fixes for elastiCore building