More updates to pass build