Fixing some cs stuff