Final fixes for saltonly boxes.