Updating BaseUtils to more recent commit