Build Mark general maintenance