Merge fixes

Signed-off-by: Walker Crouse <walkercrouse@hotmail.com>