Some fixes for comp-moved table