More updates to fix initial "up" problems