HoleController fixes