call-to-pop avoiding

Small improvements, including avoiding the call-to-pop if used by some
malwares/