Move CS fixes at the end