CS fixes and minor tweaks in the Callback class