Some tweaks for flocking.

Signed-off-by: Leif Erkenbrach <LErkenbrach@gmail.com>