Fixed declarations (still broken due to BSP traverse)