Fixes for docblocks and CS errors