updates for bug fixes during use in packages

Signed-off-by: Kyle Rockman <kyle.rockman@mac.com>