Some runtime time issue fixes...