Size optimization

This optimizes sizes to try to avoid a silicon error.