More minor cs fixes