Fixes in BOM and maintenance schedule