Fix Misc. errors throughout project that prevents Jenkins build (#49)

Fix Misc. errors throughout project that prevents Jenkins build (#49) #105