CodeLog + blockmanager fixes