Fix code addressing