fixes for cascading tables