Fixes for small errors in last push, a wanring in static tests.