[IMP] Minor changes to manage syscalls