minor changes, fresh build required after recent merges