OPS-2760 - more mods

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