Fix for type inconsistency and bigquery parser