Fix errors caused by rebase on master

Signed-off-by: Don Naegely <naegelyd@gmail.com>