Some cudi stock fixes