More deck fixes.