[5.0] CS And Docblock Fixes