Yes my concerns apply there too! Thanks for catching that! Want to fix them all in one go, or should I file an issue?