Fixed discrepancies between upstream/master that were somehow introduced