UnsuportedException, minor fixes