Fixing varius issues withing sufia