Fixes with stats + frotend