Fixing build error when adding UIMA and adding a few small changes