actually fixed last 2 warnings