Fix Agent and CM Issues