ALII-4573 and ALII-4519 Improvements.

@raensink @karlj-spindance please review.

Signed-off-by: Mike Stitt <mikes@spindance.com>