Fixed some improper class calls