Patch/minor updates