Axel proposed fixes