Implemented some defences against staging filling the disc, etc