Fix up install classes AGAIN