Prepopulate block table and some fixes