Minor improvemetns