Update with changes from Scintillua repo