Add changes from Sanoma code dump