diff --git a/os/charsio.c b/os/charsio.c
index 165eaead5..9ebdcf185 100644
--- a/os/charsio.c
+++ b/os/charsio.c
@@ -106,9 +106,7 @@ Int Yap_peek(int sno) {
 
   s = GLOBAL_Stream + sno;
 #if USE_READLINE
-  if (s->status & Readline_Stream_f
-      && trueGlobalPrologFlag(READLINE_FLAG)
-      ) {
+  if (s->status & Readline_Stream_f && trueGlobalPrologFlag(READLINE_FLAG)) {
     ch = Yap_ReadlinePeekChar(sno);
     if (ch == EOFCHAR) {
       s->stream_getc = EOFPeek;
diff --git a/os/files.c b/os/files.c
index c90c9e041..df980bd2e 100644
--- a/os/files.c
+++ b/os/files.c
@@ -484,7 +484,7 @@ file_base_name ( USES_REGS1 )
       return Yap_unify(ARG2, MkAtomTerm(Yap_LookupWideAtom(c+i)));
   } else {
       const char *c = RepAtom(at)->StrOfAE;
-      char *s;
+      const char *s;
 #if HAVE_BASENAME && 0 // DISABLED: Linux basename is not compatible with file_base_name in SWI and GNU
       char c1[YAP_FILENAME_MAX+1];
       strncpy( c1, c, YAP_FILENAME_MAX);