Small fixes to better realign with upstream