More updates to fix compile dependencies