Resolved build errors and merge issues w/Julia