[0.9.4-dev] CS fixes