Additional adjustments

Signed-off-by: jdarwood007 <unmonitored+github@sleepycode.com>