Updating bug fixes from master