Fix for runtimes and an issue with flag conflicts.

My bad.
(aran is a cheater)

Fixes #1607