[UP] Fixes