Small fixes
Approaching problem from data end