Fixed block package patches. I will squash all of my commits later.