Various ported files (Port #26