[Staffslug] A few slight problems