[TIMOB-13859] Fixed some issues with simulator builds.