Different fixes after automatic checks

Good point. While i normally is way greater than 8 at this point, there's nothing that ensures that, and this code smells...