Another batch of hectic fixes. One of those days.