Updated repository requirements and some CS fixes