Various speed-ups