Build 49

Few bug fixes. CTS fixes.