Build 1.2.9 - housekeeping