Fixed the remainder of short tag issues in CleanFS