Couple of small fixes
Still working on the pool