More updates to align with 0.5.4