Small fixes (still trying to fix issue)