Fixed up runtime issues