Analog functions corrections