Bug/new warning fixes

As described.