Fixed a few oopsies. Also fixed deprecated method warnings.