Fix build with hardcoded tables