Merge all fixes from upstream