CS Fixes

Also, the 3.0 branch can be removed now. :)