Add minor changes from ktprojman