fixes for 3.2, add entry point component override