Pull request for slightly larger but still small fixes

Yay, size variance!