CS fixes

![demo](http://stream1.gifsoup.com/view2/3062401/young-frankenstein-s-igor-o.gif)