Different fixes after automatic checks