Small fixes, working on BlockTable