Hopefully fixed issues outside of eclipse (again)