Changing a few things for compatibility