Fix Runtime Errors