Fixes detected when testing