Fixed comments and live migration