Started clearing up compile warnings.
!!!Undo this if stuff breaks!!!