ALII-4573 and ALII-4519 Improvements.

Signed-off-by: Mike Stitt <mikes@spindance.com>
Merge pull request #3 from spindance/bug/4573and4519

ALII-4573 and ALII-4519 Improvements.