Update to get last commits compiling and running on Linux

Signed-off-by: James Warren <admin@trezanik.org>