syncs some things from b3a99cc Raw commit