Fix for runtimes and an issue with flag conflicts.

Signed-off-by: Mloc <colmohici@gmail.com>
Merge pull request #1611 from Mloc/tg-revenge

Fix for runtimes and an issue with flag conflicts.