Fix issues

Makes sure that block mode works correctly.