Improved wrong table warnings
Cosmetic changes