Fix upgrade step, add cols from mixin.
Make allocations check for blocked periods.