Some build fixups.

Also changed the default to be non-blocking.

Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>