Fixing several bugs running on SCOMP