Just some CS fixs.