Improved pushing tables
Compilation fixed for g++/clang