Fixing stuff broken in the merge

Signed-off-by: Thomas Moore <tsanm93@gmail.com>