Same bugfixed for other files

Missed these out, sorry