Fix some broken references

I'll be honest, there's some debate as to whether these changes make any improvement 😬

See #261 (closed) and judge for yourself.