some cs fixes