Commits from the other day

Signed-off-by: Rob Sterlini <sterlini@fueled.com>