Minor Bugs solved after system testing with OFELIA