Runtime properties fixes