Slight fixes to support etd app