Move function calls to after check for block dir...