Size fixes, data fixes due to changing status table