Some updates and bug fixes to Infrastructure code