BS-9782, clean
BS-9839, fix web compilation