Changes up some types for compatibility